From aace5a89463ca692217d171f43a08c372fc138e3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 31 Jul 2013 18:40:52 +0200 Subject: [PATCH] Add a revealer to GtkInfoBar Make GtkInfoBar slide in and out as it is shown or hidden. https://bugzilla.gnome.org/show_bug.cgi?id=704334 --- gtk/gtkinfobar.c | 35 +++++++++++++++ gtk/gtkinfobar.ui | 110 ++++++++++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 48 deletions(-) diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index 776adc0930..396a087d19 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -41,6 +41,7 @@ #include "gtkenums.h" #include "gtkbindings.h" #include "gtkdialog.h" +#include "gtkrevealer.h" #include "gtkintl.h" #include "gtkprivate.h" #include "gtkorientable.h" @@ -127,6 +128,7 @@ struct _GtkInfoBarPrivate GtkWidget *content_area; GtkWidget *action_area; GtkWidget *close_button; + GtkWidget *revealer; gboolean show_close_button; GtkMessageType message_type; @@ -377,6 +379,36 @@ gtk_info_bar_draw (GtkWidget *widget, return FALSE; } +static void +gtk_info_bar_show (GtkWidget *widget) +{ + GtkInfoBarPrivate *priv = GTK_INFO_BAR (widget)->priv; + + GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->show (widget); + + gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), TRUE); +} + +static void +child_revealed (GObject *object, GParamSpec *pspec, gpointer data) +{ + GtkWidget *widget = data; + + GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->hide (widget); + g_signal_handlers_disconnect_by_func (object, child_revealed, widget); + g_object_notify (G_OBJECT (widget), "visible"); +} + +static void +gtk_info_bar_hide (GtkWidget *widget) +{ + GtkInfoBarPrivate *priv = GTK_INFO_BAR (widget)->priv; + + gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), FALSE); + g_signal_connect_object (priv->revealer, "notify::child-revealed", + G_CALLBACK (child_revealed), widget, 0); +} + static void gtk_info_bar_class_init (GtkInfoBarClass *klass) { @@ -394,6 +426,8 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) widget_class->get_preferred_width = gtk_info_bar_get_preferred_width; widget_class->get_preferred_height = gtk_info_bar_get_preferred_height; widget_class->draw = gtk_info_bar_draw; + widget_class->show = gtk_info_bar_show; + widget_class->hide = gtk_info_bar_hide; klass->close = gtk_info_bar_close; @@ -549,6 +583,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, content_area); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, action_area); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, close_button); + gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, revealer); } static void diff --git a/gtk/gtkinfobar.ui b/gtk/gtkinfobar.ui index 35e210762f..b5823fa9b4 100644 --- a/gtk/gtkinfobar.ui +++ b/gtk/gtkinfobar.ui @@ -5,62 +5,76 @@ True False - + True False - 8 - 16 - - - - - True - True - 0 - - - - - True - False - 6 - horizontal - 6 - end - - - - - - False - True - 1 - - - - - False - True - 6 - none - - - + True False - window-close-symbolic + 0 + 0 + + + True + False + 8 + 16 + + + + + + True + True + 0 + + + + + True + False + 6 + horizontal + 6 + end + + + + + + False + True + 1 + + + + + False + True + 6 + none + + + + True + False + window-close-symbolic + + + + + False + True + 2 + + - - False - True - 2 - -- 2.30.2